From: Daniel Drake <drake@endlessm.com>
Date: Wed, 3 May 2017 15:36:48 +0000 (-0600)
Subject: libtest: allow committing to alternative branches
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~36^2~75
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cd65f85dcbed6930eb5d3fdb344b173c4356da30;p=ostree.git

libtest: allow committing to alternative branches

This will be used by the upcoming test-admin-upgrade-endoflife.sh

Closes: #874
Approved by: cgwalters
---

diff --git a/tests/libtest.sh b/tests/libtest.sh
index 3ce718f9..1a81c755 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -446,6 +446,7 @@ os_repository_new_commit ()
 {
     boot_checksum_iteration=${1:-0}
     content_iteration=${2:-0}
+    branch=${3:-testos/buildmaster/x86_64-runtime}
     echo "BOOT ITERATION: $boot_checksum_iteration"
     cd ${test_tmpdir}/osdata
     rm boot/*
@@ -464,7 +465,7 @@ os_repository_new_commit ()
 
     version=$(date "+%Y%m%d.${content_iteration}")
 
-    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit  --add-metadata-string "version=${version}" -b testos/buildmaster/x86_64-runtime -s "Build"
+    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit  --add-metadata-string "version=${version}" -b $branch -s "Build"
     cd ${test_tmpdir}
 }